Fix memory_op hypercall mlock/munlock wrapping after the

GET/SET_XEN_GUEST_HANDLE patch.

Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c
index 989743cf3fbfe41c3266e46049bf28f6578bc79e..b507a2b794160f0e3be729660fced4446d92a4dc 100644 (file)
--- a/tools/libxc/xc_private.c
+++ b/tools/libxc/xc_private.c
@@ -226,7 +226,7 @@ int xc_memory_op(int xc_handle,
             PERROR("Could not mlock");
             goto out1;
         }
-        GET_XEN_GUEST_HANDLE(extent_start, reservation->extent_start);
+        GET_XEN_GUEST_HANDLE(extent_start, xmml->extent_start);
         if ( mlock(extent_start,
                    xmml->max_extents * sizeof(unsigned long)) != 0 )
         {
@@ -281,7 +281,7 @@ int xc_memory_op(int xc_handle,
         break;
     case XENMEM_machphys_mfn_list:
         safe_munlock(xmml, sizeof(*xmml));
-        GET_XEN_GUEST_HANDLE(extent_start, reservation->extent_start);
+        GET_XEN_GUEST_HANDLE(extent_start, xmml->extent_start);
         safe_munlock(extent_start,
                      xmml->max_extents * sizeof(unsigned long));
         break;